-
Notifications
You must be signed in to change notification settings - Fork 566
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
TGUI Parity with Upstream and Remaining React Porting & Polish #6244
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Restore button alignment fix
Replacement actually is useful now!
# Conflicts: # tgui/package.json # tgui/packages/tgui/components/Button.jsx # tgui/packages/tgui/components/Chart.jsx # tgui/packages/tgui/components/ColorBox.jsx # tgui/packages/tgui/components/Grid.jsx # tgui/packages/tgui/components/Icon.jsx # tgui/packages/tgui/components/NoticeBox.jsx # tgui/packages/tgui/components/Table.jsx # tgui/public/tgui-panel.bundle.css # tgui/webpack.config.js # tgui/yarn.lock
Drulikar
changed the title
TGUI Parity with upstream and remaining React porting & polish
TGUI Parity with Upstream and Remaining React Porting & Polish
May 6, 2024
cm13-github
removed
the
Merge Conflict
PR can't be merged because it touched too much code
label
May 16, 2024
Conflicts have been resolved. A maintainer will review the pull request shortly. |
… (can confirm they didn't work) Remove non-existant tooltipOverrideLong props
cm13-github
added a commit
that referenced
this pull request
May 17, 2024
cm13-github
added a commit
that referenced
this pull request
May 17, 2024
Drulikar
removed
the
Needs Testing
Need to test it on the guinea pigs (production server)
label
May 18, 2024
cm13-github
added a commit
that referenced
this pull request
May 18, 2024
harryob
approved these changes
May 19, 2024
cm13-github
added a commit
that referenced
this pull request
May 19, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 22, 2024
# About the pull request This PR is a follow up to #6244 effectively reverting the changes ported from tgstation/tgstation#75463 Instead of using the down() proc on the server, we are once again doing the tgsay open via winset on hotkey so it is more responsive. However, to fix the issue with tgsay opening when say another window is focused, it now has an embedded winget for map.focus and thats sent in the payload. # Explain why it's good for the game Should make tgsay open more responsively again. This was the reason why I needed to make the change in the first place: ![bug](https://github.com/cmss13-devs/cmss13/assets/76988376/0288d3d1-e3c9-4cf7-95c2-9f7ef88095da) # Testing Photographs and Procedure But now that bug is fixed, and we're opening the old way again! ![tgsay](https://github.com/cmss13-devs/cmss13/assets/76988376/0997f797-7b99-4e6e-acda-722a783b010f) # Changelog :cl: Drathek ui: TGSay is now opened the same way it used to for more responsiveness /:cl:
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 3, 2024
…nt (#7474) # About the pull request This PR is a follow-up to #5777 and #6244 because Button.Confirm was changed how its confirm content was displayed. It used to display the children always, but TG since changed it to display either the confirm content or the children. Now the children will be displayed if there is no confirm content set. # Explain why it's good for the game Fixes confusing buttons in the ping relay browser. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Before: ![image](https://github.com/user-attachments/assets/a48b01e9-ca8d-4521-9ac5-8f4cfb07f6eb) After: ![image](https://github.com/user-attachments/assets/46151d2f-139c-4f30-b4fb-0892572bf64f) </details> # Changelog :cl: Drathek ui: Fixed the ping relay buttons not displaying anything when clicked on the first time. Now Button.Confirm.confirmContent will only replace children if it is truthy. /:cl:
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Code Improvement
Make the code longer
Fix
Fix one bug, make ten more
Testmerge Candidate
we'll test this while you're asleep and the server has 10 players
UI
deletes nanoui/html
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
This PR is a follow up to #5493 and ultimately is aimed at bringing us back into parity with TG's version of the TGUI components again. For the most part this PR is done via diffing TG's TGUI folder with ours. The PRs listed below are what I found in blames and I double checked to see what files if any they affected outside the TGUI folder.
It is recommended to close VSC and run bin/clean.cmd and then bin/build.cmd if you try out this branch. You will be using the wrong node & prettier version otherwise.
This at least partially ports these PRs (and likely many others - but these I explicitly checked for how they affected other files):
tgui_alert()
and siblings tgstation/tgstation#79322Additionally it ports the new base components from:
But these are missing documentation in the components readme, and we do not have any interface that utilizes them yet. I wanted to explicitly mention them separately so people can see what they can do.
Changes I still intend to do in this PR or investigate:
Other notable changes not directly related to the above ports, but done as I was fixing other problems:
Explain why it's good for the game
Prepares us for 516 (though still more changes will be necessary) and finalizes the react port.
Testing Photographs and Procedure
Screenshots & Videos
New list modal w/ duplicate key handling:
Fixed VOX panel (sound files used to overlap type select):
Updated shuttle manipulator window:
With replace any shuttle support:
Erase current tab chat history:
Working case sensitivity highlights:
Unread counter toggle per tab:
Larger strip panel:
Tacmap panel polish (button positioning + dropdown text color when highlighted):
Minor tweak to camera panel:
Dropdowns will now display above if too little space below:
Kitchen sink works again (F12 w/ tgui-dev):
Layout mode works again (F11 w/ tgui-dev):
New checkbox modal (with theme support):
New handling for button sizes in alert modals (stacked list since options wanted to use more horizontal space than limit):
Polished smart fridge + restore wiring panel:
Fixed byondui in supply pod menu:
TG Say:
Some unchanged panels (to just show working):
Changelog
🆑 Drathek, mullenpaul
ui: Finalizes the TGUI React port and brings us back into parity again with TG's interface components
ui: Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same.
ui: VOX panel's second tab now doesn't overlap the other buttons
ui: Wiring panel for some machines is now restored to use circular indicators again
ui: Smart fridge interface is more in line with sorted inventories as far as layout & tooltips
ui: Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date)
ui: Reworks RestrictedInput number handling
ui: Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, and Checkbox TGUI components (but nothing uses them yet)
ui: Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity
ui: Updates the ship manipulator window to allow replacing any Shuttle
ui: Fixes the supply pod panel not displaying its byondui map correctly
ui: Fixes the research terminal duplicating papers in display old mode.
ui: Updates the tgui_input_list to for new features like hotkey selection, duplicate key handling, etc
fix: Fixes thinking runtimes when quickly switching between tgsay categories
code: Shuttle subsystem now is less aggressive with reservations (skipping deletion if below a threshold, delaying reservation if above a threshold)
fix: Fixes F5 key still refreshing a TGUI window even if default was set to be prevented (e.g. Hotkey interface)
/:cl: